public class hello{
	public static main(String[] arge){
		System.out.println("hello!!!");
		System.out.println("hello!!!");
		System.out.println("hello!!!--------------------------master分支");
		System.out.println("hello!!!-------dev分支修改了");
		System.out.println("hello!!!-------------dev第二次分支修改了");
		System.out.println("hello!!!");
		System.out.println("hello!!!");
		System.out.println("hello!!!--我里格亲娘了哇");
		System.out.println("hello!!!-我里格亲娘了哇");
		System.out.println("hello!!!-我里格亲娘了哇");
		System.out.println("hello!!!-我里格亲娘了哇");
		System.out.println("在本地修改了！！！");
	}
    public void mod(){
        show("xxxx");
    }
}